From: Kenichi Handa <handa@m17n.org>
Date: Thu, 3 Apr 2008 04:06:55 +0000 (+0000)
Subject: (create-fontset-from-x-resource):
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~22777
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1c9992b7da199ef2f57adf1d870db1b75c57c0d8;p=emacs.git

(create-fontset-from-x-resource):
Handle the error of X resource more gracefully.
---

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index b8c4a964b82..7fa9761ef07 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -944,7 +944,9 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 	fontset-spec)
     (while (setq fontset-spec (x-get-resource (format "fontset-%d" idx)
 					      (format "Fontset-%d" idx)))
-      (create-fontset-from-fontset-spec fontset-spec t 'noerror)
+      (condition-case nil
+	  (create-fontset-from-fontset-spec fontset-spec t 'noerror)
+	(error (message "Fontset-%d: invalid specification in X resource" idx)))
       (setq idx (1+ idx)))))
 
 ;;